From bb8eb7dcecd2ba502ac5f076d9451d62e0b76bff Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Mon, 22 Dec 2014 16:39:54 +0100
Subject: [PATCH 1/2] Fix mirror type sizes

--HG--
branch : hotfix
---
 code/ryzom/common/src/game_share/ryzom_mirror_properties.h | 2 +-
 code/ryzom/server/data_shard/mirror_sheets/fe_temp.dataset | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/ryzom/common/src/game_share/ryzom_mirror_properties.h b/code/ryzom/common/src/game_share/ryzom_mirror_properties.h
index 55d8b9bbb..134ebe38b 100644
--- a/code/ryzom/common/src/game_share/ryzom_mirror_properties.h
+++ b/code/ryzom/common/src/game_share/ryzom_mirror_properties.h
@@ -138,7 +138,7 @@ void	initRyzomVisualPropertyIndices( CMirroredDataSet& dataset );
 #define TYPE_BOT_TRADE_SELECTOR2 uint64
 
 #define TYPE_EVENT_FACTION_ID uint32
-#define TYPE_PVP_MODE uint32
+#define TYPE_PVP_MODE uint16
 #define TYPE_PVP_CLAN uint32
 
 #define TYPE_FUEL bool
diff --git a/code/ryzom/server/data_shard/mirror_sheets/fe_temp.dataset b/code/ryzom/server/data_shard/mirror_sheets/fe_temp.dataset
index f88263c27..b891b6252 100644
--- a/code/ryzom/server/data_shard/mirror_sheets/fe_temp.dataset
+++ b/code/ryzom/server/data_shard/mirror_sheets/fe_temp.dataset
@@ -292,14 +292,14 @@
       </STRUCT>
       <STRUCT>
         <ATOM Name="name" Value="PvpMode"/>
-        <ATOM Name="type" Value="uint8"/>
+        <ATOM Name="type" Value="uint16"/>
         <ATOM Name="persistant" Value="true"/>
         <ATOM Name="mirror" Value="true"/>
         <ATOM Name="weight" Value="1"/>
       </STRUCT>
       <STRUCT>
         <ATOM Name="name" Value="PvpClan"/>
-        <ATOM Name="type" Value="uint8"/>
+        <ATOM Name="type" Value="uint32"/>
         <ATOM Name="persistant" Value="true"/>
         <ATOM Name="mirror" Value="true"/>
         <ATOM Name="weight" Value="1"/>

From e311547a39ac9d07a7612b75eb313e4fdad9410b Mon Sep 17 00:00:00 2001
From: dfighter1985 <none@none>
Date: Sun, 1 Feb 2015 20:29:26 +0100
Subject: [PATCH 2/2] Initialize Nel3D in the Object Viewer plugin too.

--HG--
branch : hotfix
---
 code/nel/src/3d/driver_user.cpp               | 15 +-------------
 code/nel/src/3d/init_3d.cpp                   | 20 ++++++++++++++++++-
 .../object_viewer/object_viewer_plugin.cpp    |  3 +++
 3 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/code/nel/src/3d/driver_user.cpp b/code/nel/src/3d/driver_user.cpp
index c4dc97655..017a2b6dc 100644
--- a/code/nel/src/3d/driver_user.cpp
+++ b/code/nel/src/3d/driver_user.cpp
@@ -109,10 +109,6 @@ void					UDriver::purgeMemory()
 // ***************************************************************************
 
 
-// ***************************************************************************
-bool	CDriverUser::_StaticInit= false;
-
-
 // ***************************************************************************
 CDriverUser::CDriverUser (uintptr_t windowIcon, TDriver driver, emptyProc exitFunc)
 {
@@ -122,16 +118,7 @@ CDriverUser::CDriverUser (uintptr_t windowIcon, TDriver driver, emptyProc exitFu
 	nlassert((uint)IDriver::iconCount == (uint)UDriver::iconCount);
 
 
-	// Static Initialisation.
-	if(!_StaticInit)
-	{
-		_StaticInit= true;
-		// Register basic serial.
-		NL3D::registerSerial3d();
-
-		// Register basic csene.
-		CScene::registerBasics();
-	}
+	NL3D::init3d();
 
 	_Driver = NULL;
 
diff --git a/code/nel/src/3d/init_3d.cpp b/code/nel/src/3d/init_3d.cpp
index bd8dffdfd..4ba439b73 100644
--- a/code/nel/src/3d/init_3d.cpp
+++ b/code/nel/src/3d/init_3d.cpp
@@ -19,18 +19,36 @@
 
 #include "nel/3d/init_3d.h"
 #include <cfloat>
+#include "nel/3d/scene.h"
+#include "nel/3d/register_3d.h"
+
+namespace
+{
+static bool _Initialized = false;
+}
 
 namespace NL3D
 {
 
 void init3d ()
 {
+
+	if( _Initialized )
+		return;
+
 	// Init for windows
 #ifdef NL_OS_WINDOWS
 	// Enable FPU exceptions
 
 	// Enable divid by zero and  overflow exception
-	_control87 (_EM_INVALID|_EM_DENORMAL/*|_EM_ZERODIVIDE|_EM_OVERFLOW*/|_EM_UNDERFLOW|_EM_INEXACT, _MCW_EM);
+	//_control87 (_EM_INVALID|_EM_DENORMAL/*|_EM_ZERODIVIDE|_EM_OVERFLOW*/|_EM_UNDERFLOW|_EM_INEXACT, _MCW_EM);
+
+	NL3D::registerSerial3d();
+	CScene::registerBasics();
+
+	_Initialized = true;
+
+
 #endif // NL_OS_WINDOWS
 }
 
diff --git a/code/studio/src/plugins/object_viewer/object_viewer_plugin.cpp b/code/studio/src/plugins/object_viewer/object_viewer_plugin.cpp
index dce7ad08f..a4c948140 100644
--- a/code/studio/src/plugins/object_viewer/object_viewer_plugin.cpp
+++ b/code/studio/src/plugins/object_viewer/object_viewer_plugin.cpp
@@ -8,6 +8,7 @@
 
 // NeL includes
 #include "nel/misc/debug.h"
+#include "nel/3d/init_3d.h"
 
 // Qt includes
 #include <QtCore/QObject>
@@ -32,6 +33,8 @@ bool ObjectViewerPlugin::initialize(ExtensionSystem::IPluginManager *pluginManag
 {
 	Q_UNUSED(errorString);
 	_plugMan = pluginManager;
+
+	NL3D::init3d();
 	Modules::init();
 	addAutoReleasedObject(new CObjectViewerContext());
 	addAutoReleasedObject(new GraphicsSettingsPage());